0
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-04-15 05:44:46 +00:00

style: update codestyle for coding-standard 1.2.3

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2024-08-23 15:10:27 +02:00
parent 1cc6b3577f
commit af6de04e9e
No known key found for this signature in database
GPG key ID: 36E3664E099D0614
872 changed files with 7874 additions and 7874 deletions
apps
admin_audit/lib/Actions
cloud_federation_api/lib
comments
contactsinteraction/lib
dav/lib
BackgroundJob
BulkUpload
CalDAV
CardDAV
Command
Comments
Connector/Sabre
Controller
DAV
Db
Direct
Events
Listener
Migration

View file

@ -43,7 +43,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file read: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file read: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -65,7 +65,7 @@ class Files extends Action {
$this->renamedNodes[$source->getId()] = $source;
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file rename: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file rename: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -87,7 +87,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file rename: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file rename: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -113,7 +113,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file create: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file create: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -142,7 +142,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file copy: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file copy: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -167,7 +167,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file write: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file write: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -195,7 +195,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file update: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file update: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -219,7 +219,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file delete: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file delete: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
@ -248,7 +248,7 @@ class Files extends Action {
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file preview: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
'Exception thrown in file preview: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}

View file

@ -55,8 +55,8 @@ class Capabilities implements ICapability {
$resource = $this->provider->createNewResourceType();
$resource->setName('file')
->setShareTypes(['user', 'group'])
->setProtocols(['webdav' => '/public.php/webdav/']);
->setShareTypes(['user', 'group'])
->setProtocols(['webdav' => '/public.php/webdav/']);
$this->provider->addResourceType($resource);

View file

@ -71,6 +71,7 @@ class RequestHandlerController extends Controller {
* @param string $resourceType 'file', 'calendar',...
*
* @return JSONResponse<Http::STATUS_CREATED, CloudFederationAPIAddShare, array{}>|JSONResponse<Http::STATUS_BAD_REQUEST, CloudFederationAPIValidationError, array{}>|JSONResponse<Http::STATUS_NOT_IMPLEMENTED, CloudFederationAPIError, array{}>
*
* 201: The notification was successfully received. The display name of the recipient might be returned in the body
* 400: Bad request due to invalid parameters, e.g. when `shareWith` is not found or required properties are missing
* 501: Share type or the resource type is not supported
@ -196,6 +197,7 @@ class RequestHandlerController extends Controller {
* @param array<string, mixed>|null $notification The actual payload of the notification
*
* @return JSONResponse<Http::STATUS_CREATED, array<string, mixed>, array{}>|JSONResponse<Http::STATUS_BAD_REQUEST, CloudFederationAPIValidationError, array{}>|JSONResponse<Http::STATUS_FORBIDDEN|Http::STATUS_NOT_IMPLEMENTED, CloudFederationAPIError, array{}>
*
* 201: The notification was successfully received
* 400: Bad request due to invalid parameters, e.g. when `type` is invalid or missing
* 403: Getting resource is not allowed

View file

@ -67,7 +67,7 @@ class Listener {
$activity->setApp('comments')
->setType('comments')
->setAuthor($actor)
->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
->setObject($event->getComment()->getObjectType(), (int)$event->getComment()->getObjectId())
->setMessage('add_comment_message', [
'commentId' => $event->getComment()->getId(),
]);
@ -79,7 +79,7 @@ class Listener {
$activity->setSubject('add_comment_subject', [
'actor' => $actor,
'fileId' => (int) $event->getComment()->getObjectId(),
'fileId' => (int)$event->getComment()->getObjectId(),
'filePath' => trim($path, '/'),
]);
$this->activityManager->publish($activity);

View file

@ -148,7 +148,7 @@ class Provider implements IProvider {
$commentId = $messageParameters['commentId'] ?? $messageParameters[0];
try {
$comment = $this->commentsManager->get((string) $commentId);
$comment = $this->commentsManager->get((string)$commentId);
$message = $comment->getMessage();
$mentionCount = 1;

View file

@ -85,7 +85,7 @@ class LegacyProvider extends Provider {
* @throws NotFoundException
*/
protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
$nodes = $userFolder->getById((int) $comment->getObjectId());
$nodes = $userFolder->getById((int)$comment->getObjectId());
if (empty($nodes)) {
throw new NotFoundException('File not found');
}

View file

@ -11,9 +11,9 @@ use OCP\Comments\ICommentsManager;
use Test\TestCase;
class CommentersSorterTest extends TestCase {
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */
protected $commentsManager;
/** @var CommentersSorter */
/** @var CommentersSorter */
protected $sorter;
protected function setUp(): void {

View file

@ -13,7 +13,7 @@ use OCP\Comments\IComment;
use Test\TestCase;
class EventHandlerTest extends TestCase {
/** @var CommentsEventListener */
/** @var CommentsEventListener */
protected $eventHandler;
/** @var ActivityListener|\PHPUnit\Framework\MockObject\MockObject */

View file

@ -26,7 +26,7 @@ class ListenerTest extends TestCase {
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
protected $urlGenerator;
/** @var Listener */
/** @var Listener */
protected $listener;
protected function setUp(): void {

View file

@ -39,7 +39,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
* @throws Exception
*/
public function delete(): void {
throw new Exception("This addressbook is immutable");
throw new Exception('This addressbook is immutable');
}
/**
@ -47,7 +47,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
* @throws Exception
*/
public function createFile($name, $data = null) {
throw new Exception("This addressbook is immutable");
throw new Exception('This addressbook is immutable');
}
/**
@ -65,7 +65,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
$this->getACL()
);
} catch (DoesNotExistException $ex) {
throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
throw new NotFound('Contact does not exist: ' . $ex->getMessage(), 0, $ex);
}
}
@ -112,7 +112,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
* @throws Exception
*/
public function propPatch(PropPatch $propPatch) {
throw new Exception("This addressbook is immutable");
throw new Exception('This addressbook is immutable');
}
/**

View file

@ -70,7 +70,7 @@ class Card implements ICard, IACL {
* @inheritDoc
*/
public function getETag(): ?string {
return '"' . md5((string) $this->getLastModified()) . '"';
return '"' . md5((string)$this->getLastModified()) . '"';
}
/**
@ -91,7 +91,7 @@ class Card implements ICard, IACL {
* @inheritDoc
*/
public function getName(): string {
return (string) $this->contact->getId();
return (string)$this->contact->getId();
}
/**

View file

@ -50,7 +50,7 @@ class CardSearchDao {
}
$addressbooksQuery->selectDistinct('id')
->from('addressbooks')
->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter('principals/users/' . $user->getUID())));
$propQuery->selectDistinct('cardid')
->from('cards_properties')
->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))

View file

@ -45,12 +45,12 @@ class ContactInteractionListener implements IEventListener {
}
if ($event->getUid() === null && $event->getEmail() === null && $event->getFederatedCloudId() === null) {
$this->logger->warning("Contact interaction event has no user identifier set");
$this->logger->warning('Contact interaction event has no user identifier set');
return;
}
if ($event->getUid() !== null && $event->getUid() === $event->getActor()->getUID()) {
$this->logger->info("Ignoring contact interaction with self");
$this->logger->info('Ignoring contact interaction with self');
return;
}

View file

@ -53,8 +53,8 @@ class BuildReminderIndexBackgroundJob extends QueuedJob {
}
public function run($argument) {
$offset = (int) $argument['offset'];
$stopAt = (int) $argument['stopAt'];
$offset = (int)$argument['offset'];
$stopAt = (int)$argument['stopAt'];
$this->logger->info('Building calendar reminder index (' . $offset .'/' . $stopAt . ')');
@ -88,7 +88,7 @@ class BuildReminderIndexBackgroundJob extends QueuedJob {
$result = $query->executeQuery();
while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
$offset = (int) $row['id'];
$offset = (int)$row['id'];
if (is_resource($row['calendardata'])) {
$row['calendardata'] = stream_get_contents($row['calendardata']);
}

View file

@ -14,7 +14,7 @@ use OCP\IDBConnection;
class CleanupInvitationTokenJob extends TimedJob {
/** @var IDBConnection */
/** @var IDBConnection */
private $db;
public function __construct(IDBConnection $db, ITimeFactory $time) {

View file

@ -30,6 +30,6 @@ class DeleteOutdatedSchedulingObjects extends TimedJob {
protected function run($argument): void {
$time = $this->time->getTime() - (60 * 60);
$this->calDavBackend->deleteOutdatedSchedulingObjects($time, 50000);
$this->logger->info("Removed outdated scheduling objects");
$this->logger->info('Removed outdated scheduling objects');
}
}

View file

@ -41,7 +41,7 @@ class OutOfOfficeEventDispatcherJob extends QueuedJob {
try {
$absence = $this->absenceMapper->findById($id);
} catch (DoesNotExistException | \OCP\DB\Exception $e) {
} catch (DoesNotExistException|\OCP\DB\Exception $e) {
$this->logger->error('Failed to dispatch out-of-office event: ' . $e->getMessage(), [
'exception' => $e,
'argument' => $argument,

View file

@ -34,8 +34,8 @@ class PruneOutdatedSyncTokensJob extends TimedJob {
}
public function run($argument) {
$limit = max(1, (int) $this->config->getAppValue(Application::APP_ID, 'totalNumberOfSyncTokensToKeep', '10000'));
$retention = max(7, (int) $this->config->getAppValue(Application::APP_ID, 'syncTokensRetentionDays', '60')) * 24 * 3600;
$limit = max(1, (int)$this->config->getAppValue(Application::APP_ID, 'totalNumberOfSyncTokensToKeep', '10000'));
$retention = max(7, (int)$this->config->getAppValue(Application::APP_ID, 'syncTokensRetentionDays', '60')) * 24 * 3600;
$prunedCalendarSyncTokens = $this->calDavBackend->pruneOutdatedSyncTokens($limit, $retention);
$prunedAddressBookSyncTokens = $this->cardDavBackend->pruneOutdatedSyncTokens($limit, $retention);

View file

@ -104,7 +104,7 @@ class RefreshWebcalJob extends Job {
foreach ($forceInt as $column) {
if (isset($row[$column])) {
$row[$column] = (int) $row[$column];
$row[$column] = (int)$row[$column];
}
}
}

View file

@ -45,7 +45,7 @@ class UploadCleanup extends TimedJob {
/** @var Folder $uploads */
$uploads = $userRoot->get('uploads');
$uploadFolder = $uploads->get($folder);
} catch (NotFoundException | NoUserException $e) {
} catch (NotFoundException|NoUserException $e) {
$this->jobList->remove(self::class, $argument);
return;
}
@ -54,7 +54,7 @@ class UploadCleanup extends TimedJob {
$time = $this->time->getTime() - 60 * 60 * 24;
if (!($uploadFolder instanceof Folder)) {
$this->logger->error("Found a file inside the uploads folder. Uid: " . $uid . ' folder: ' . $folder);
$this->logger->error('Found a file inside the uploads folder. Uid: ' . $uid . ' folder: ' . $folder);
if ($uploadFolder->getMTime() < $time) {
$uploadFolder->delete();
}

View file

@ -44,7 +44,7 @@ class BulkUploadPlugin extends ServerPlugin {
*/
public function httpPost(RequestInterface $request, ResponseInterface $response): bool {
// Limit bulk upload to the /dav/bulk endpoint
if ($request->getPath() !== "bulk") {
if ($request->getPath() !== 'bulk') {
return true;
}
@ -77,16 +77,16 @@ class BulkUploadPlugin extends ServerPlugin {
$node = $this->userFolder->getFirstNodeById($node->getId());
$writtenFiles[$headers['x-file-path']] = [
"error" => false,
"etag" => $node->getETag(),
"fileid" => DavUtil::getDavFileId($node->getId()),
"permissions" => DavUtil::getDavPermissions($node),
'error' => false,
'etag' => $node->getETag(),
'fileid' => DavUtil::getDavFileId($node->getId()),
'permissions' => DavUtil::getDavPermissions($node),
];
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), ['path' => $headers['x-file-path']]);
$writtenFiles[$headers['x-file-path']] = [
"error" => true,
"message" => $e->getMessage(),
'error' => true,
'message' => $e->getMessage(),
];
}
}

View file

@ -19,10 +19,10 @@ class MultipartRequestParser {
private $stream;
/** @var string */
private $boundary = "";
private $boundary = '';
/** @var string */
private $lastBoundary = "";
private $lastBoundary = '';
/**
* @throws BadRequest
@ -39,7 +39,7 @@ class MultipartRequestParser {
}
if ($contentType === null) {
throw new BadRequest("Content-Type can not be null");
throw new BadRequest('Content-Type can not be null');
}
$this->stream = $stream;
@ -60,7 +60,7 @@ class MultipartRequestParser {
[$mimeType, $boundary] = explode(';', $contentType);
[$boundaryKey, $boundaryValue] = explode('=', $boundary);
} catch (\Exception $e) {
throw new BadRequest("Error while parsing boundary in Content-Type header.", Http::STATUS_BAD_REQUEST, $e);
throw new BadRequest('Error while parsing boundary in Content-Type header.', Http::STATUS_BAD_REQUEST, $e);
}
$boundaryValue = trim($boundaryValue);
@ -96,7 +96,7 @@ class MultipartRequestParser {
$seekBackResult = fseek($this->stream, -$expectedContentLength, SEEK_CUR);
if ($seekBackResult === -1) {
throw new Exception("Unknown error while seeking content", Http::STATUS_INTERNAL_SERVER_ERROR);
throw new Exception('Unknown error while seeking content', Http::STATUS_INTERNAL_SERVER_ERROR);
}
return $expectedContent === $content;
@ -134,7 +134,7 @@ class MultipartRequestParser {
$headers = $this->readPartHeaders();
$content = $this->readPartContent($headers["content-length"], $headers["x-file-md5"]);
$content = $this->readPartContent($headers['content-length'], $headers['x-file-md5']);
return [$headers, $content];
}
@ -146,7 +146,7 @@ class MultipartRequestParser {
*/
private function readBoundary(): string {
if (!$this->isAtBoundary()) {
throw new BadRequest("Boundary not found where it should be.");
throw new BadRequest('Boundary not found where it should be.');
}
return fread($this->stream, strlen($this->boundary));
@ -180,12 +180,12 @@ class MultipartRequestParser {
}
}
if (!isset($headers["content-length"])) {
throw new LengthRequired("The Content-Length header must not be null.");
if (!isset($headers['content-length'])) {
throw new LengthRequired('The Content-Length header must not be null.');
}
if (!isset($headers["x-file-md5"])) {
throw new BadRequest("The X-File-MD5 header must not be null.");
if (!isset($headers['x-file-md5'])) {
throw new BadRequest('The X-File-MD5 header must not be null.');
}
return $headers;
@ -201,7 +201,7 @@ class MultipartRequestParser {
$computedMd5 = $this->computeMd5Hash($length);
if ($md5 !== $computedMd5) {
throw new BadRequest("Computed md5 hash is incorrect.");
throw new BadRequest('Computed md5 hash is incorrect.');
}
if ($length === 0) {
@ -215,7 +215,7 @@ class MultipartRequestParser {
}
if ($length !== 0 && feof($this->stream)) {
throw new Exception("Unexpected EOF while reading stream.");
throw new Exception('Unexpected EOF while reading stream.');
}
// Read '\r\n'.

View file

@ -133,7 +133,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('calendar', (int) $calendarData['id'])
->setObject('calendar', (int)$calendarData['id'])
->setType('calendar')
->setAuthor($currentUser);
@ -161,7 +161,7 @@ class Backend {
[
'actor' => $currentUser,
'calendar' => [
'id' => (int) $calendarData['id'],
'id' => (int)$calendarData['id'],
'uri' => $calendarData['uri'],
'name' => $calendarData['{DAV:}displayname'],
],
@ -192,7 +192,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('calendar', (int) $calendarData['id'])
->setObject('calendar', (int)$calendarData['id'])
->setType('calendar')
->setAuthor($currentUser);
@ -217,7 +217,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'calendar' => [
'id' => (int) $calendarData['id'],
'id' => (int)$calendarData['id'],
'uri' => $calendarData['uri'],
'name' => $calendarData['{DAV:}displayname'],
],
@ -246,7 +246,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'calendar' => [
'id' => (int) $calendarData['id'],
'id' => (int)$calendarData['id'],
'uri' => $calendarData['uri'],
'name' => $calendarData['{DAV:}displayname'],
],
@ -288,7 +288,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'calendar' => [
'id' => (int) $calendarData['id'],
'id' => (int)$calendarData['id'],
'uri' => $calendarData['uri'],
'name' => $calendarData['{DAV:}displayname'],
],
@ -315,7 +315,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'calendar' => [
'id' => (int) $calendarData['id'],
'id' => (int)$calendarData['id'],
'uri' => $calendarData['uri'],
'name' => $calendarData['{DAV:}displayname'],
],
@ -393,7 +393,7 @@ class Backend {
[
'actor' => $event->getAuthor(),
'calendar' => [
'id' => (int) $properties['id'],
'id' => (int)$properties['id'],
'uri' => $properties['uri'],
'name' => $properties['{DAV:}displayname'],
],
@ -443,7 +443,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('calendar', (int) $calendarData['id'])
->setObject('calendar', (int)$calendarData['id'])
->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
->setAuthor($currentUser);
@ -460,7 +460,7 @@ class Backend {
$params = [
'actor' => $event->getAuthor(),
'calendar' => [
'id' => (int) $calendarData['id'],
'id' => (int)$calendarData['id'],
'uri' => $calendarData['uri'],
'name' => $calendarData['{DAV:}displayname'],
],
@ -534,7 +534,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('calendar', (int) $targetCalendarData['id'])
->setObject('calendar', (int)$targetCalendarData['id'])
->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
->setAuthor($currentUser);
@ -551,12 +551,12 @@ class Backend {
$params = [
'actor' => $event->getAuthor(),
'sourceCalendar' => [
'id' => (int) $sourceCalendarData['id'],
'id' => (int)$sourceCalendarData['id'],
'uri' => $sourceCalendarData['uri'],
'name' => $sourceCalendarData['{DAV:}displayname'],
],
'targetCalendar' => [
'id' => (int) $targetCalendarData['id'],
'id' => (int)$targetCalendarData['id'],
'uri' => $targetCalendarData['uri'],
'name' => $targetCalendarData['{DAV:}displayname'],
],
@ -603,9 +603,9 @@ class Backend {
}
if ($componentType === 'VEVENT') {
return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
return ['id' => (string)$component->UID, 'name' => (string)$component->SUMMARY, 'type' => 'event'];
}
return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
return ['id' => (string)$component->UID, 'name' => (string)$component->SUMMARY, 'type' => 'todo', 'status' => (string)$component->STATUS];
}
/**

View file

@ -40,8 +40,8 @@ class Calendar implements IFilter {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* @since 11.0.0
*/
public function getPriority() {

View file

@ -40,8 +40,8 @@ class Todo implements IFilter {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* @since 11.0.0
*/
public function getPriority() {

View file

@ -24,8 +24,8 @@ class Calendar extends CalDAVSetting {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* @since 11.0.0
*/
public function getPriority() {

View file

@ -24,8 +24,8 @@ class Event extends CalDAVSetting {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* @since 11.0.0
*/
public function getPriority() {

View file

@ -25,8 +25,8 @@ class Todo extends CalDAVSetting {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* @since 11.0.0
*/
public function getPriority() {

View file

@ -87,7 +87,7 @@ class BirthdayService {
return;
}
foreach ($datesToSync as $type) {
$this->updateCalendar($cardUri, $cardData, $book, (int) $calendar['id'], $type, $reminderOffset);
$this->updateCalendar($cardUri, $cardData, $book, (int)$calendar['id'], $type, $reminderOffset);
}
}
}
@ -247,7 +247,7 @@ class BirthdayService {
$vEvent->{'X-NEXTCLOUD-BC-FIELD-TYPE'} = $dateField;
$vEvent->{'X-NEXTCLOUD-BC-UNKNOWN-YEAR'} = $dateParts['year'] === null ? '1' : '0';
if ($originalYear !== null) {
$vEvent->{'X-NEXTCLOUD-BC-YEAR'} = (string) $originalYear;
$vEvent->{'X-NEXTCLOUD-BC-YEAR'} = (string)$originalYear;
}
if ($reminderOffset) {
$alarm = $vCal->createComponent('VALARM');
@ -287,7 +287,7 @@ class BirthdayService {
foreach ($books as $book) {
$cards = $this->cardDavBackEnd->getCards($book['id']);
foreach ($cards as $card) {
$this->onCardChanged((int) $book['id'], $card['uri'], $card['carddata']);
$this->onCardChanged((int)$book['id'], $card['uri'], $card['carddata']);
}
}
}

View file

@ -32,7 +32,7 @@ class CachedSubscriptionImpl implements ICalendar {
* @since 13.0.0
*/
public function getKey(): string {
return (string) $this->calendarInfo['id'];
return (string)$this->calendarInfo['id'];
}
/**
@ -62,7 +62,7 @@ class CachedSubscriptionImpl implements ICalendar {
* @param string $pattern which should match within the $searchProperties
* @param array $searchProperties defines the properties within the query pattern should match
* @param array $options - optional parameters:
* ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
* ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
* @param int|null $limit - limit number of search results
* @param int|null $offset - offset for paging of search results
* @return array an array of events/journals/todos which are arrays of key-value-pairs

View file

@ -258,8 +258,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$calendars = [];
while (($row = $result->fetch()) !== false) {
$calendars[] = [
'id' => (int) $row['id'],
'deleted_at' => (int) $row['deleted_at'],
'id' => (int)$row['id'],
'deleted_at' => (int)$row['deleted_at'],
];
}
$result->closeCursor();
@ -319,7 +319,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$calendars = [];
while ($row = $result->fetch()) {
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
$components = [];
if ($row['components']) {
$components = explode(',', $row['components']);
@ -382,12 +382,12 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
while ($row = $results->fetch()) {
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
if ($row['principaluri'] === $principalUri) {
continue;
}
$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
if (isset($calendars[$row['id']])) {
if ($readOnly) {
// New share can not have more permissions than the old one.
@ -452,7 +452,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$stmt = $query->executeQuery();
$calendars = [];
while ($row = $stmt->fetch()) {
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
$components = [];
if ($row['components']) {
$components = explode(',', $row['components']);
@ -502,7 +502,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->executeQuery();
while ($row = $result->fetch()) {
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
[, $name] = Uri\split($row['principaluri']);
$row['displayname'] = $row['displayname'] . "($name)";
$components = [];
@ -567,7 +567,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
throw new NotFound('Node with name \'' . $uri . '\' could not be found');
}
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
[, $name] = Uri\split($row['principaluri']);
$row['displayname'] = $row['displayname'] . ' ' . "($name)";
$components = [];
@ -622,7 +622,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
return null;
}
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
$components = [];
if ($row['components']) {
$components = explode(',', $row['components']);
@ -670,7 +670,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
return null;
}
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
$components = [];
if ($row['components']) {
$components = explode(',', $row['components']);
@ -718,7 +718,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
return null;
}
$row['principaluri'] = (string) $row['principaluri'];
$row['principaluri'] = (string)$row['principaluri'];
$subscription = [
'id' => $row['id'],
'uri' => $row['uri'],
@ -774,7 +774,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
if (isset($properties[$transp])) {
$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
$values['transparent'] = (int)($properties[$transp]->getValue() === 'transparent');
}
foreach ($this->propertyMap as $xmlName => [$dbName, $type]) {
@ -827,7 +827,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
switch ($propertyName) {
case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp':
$fieldName = 'transparent';
$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
$newValues[$fieldName] = (int)($propertyValue->getValue() === 'transparent');
break;
default:
$fieldName = $this->propertyMap[$propertyName][0];
@ -844,7 +844,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
$query->executeStatement();
$this->addChanges($calendarId, [""], 2);
$this->addChanges($calendarId, [''], 2);
$calendarData = $this->getCalendarById($calendarId);
$shares = $this->getShares($calendarId);
@ -1067,12 +1067,12 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'uri' => $row['uri'],
'lastmodified' => $row['lastmodified'],
'etag' => '"' . $row['etag'] . '"',
'calendarid' => (int) $row['calendarid'],
'calendartype' => (int) $row['calendartype'],
'size' => (int) $row['size'],
'calendarid' => (int)$row['calendarid'],
'calendartype' => (int)$row['calendartype'],
'size' => (int)$row['size'],
'component' => strtolower($row['componenttype']),
'classification' => (int) $row['classification'],
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'],
'classification' => (int)$row['classification'],
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int)$row['deleted_at'],
];
}
$stmt->closeCursor();
@ -1111,7 +1111,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'size' => (int)$row['size'],
'component' => strtolower($row['componenttype']),
'classification' => (int)$row['classification'],
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'],
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int)$row['deleted_at'],
];
}
$stmt->closeCursor();
@ -1171,7 +1171,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'calendardata' => $this->readBlob($row['calendardata']),
'component' => strtolower($row['componenttype']),
'classification' => (int)$row['classification'],
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'],
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int)$row['deleted_at'],
];
}
@ -1260,7 +1260,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->andWhere($qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType)))
->andWhere($qb->expr()->isNull('deleted_at'));
$result = $qb->executeQuery();
$count = (int) $result->fetchOne();
$count = (int)$result->fetchOne();
$result->closeCursor();
if ($count !== 0) {
@ -1348,15 +1348,15 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
return $this->atomic(function () use ($calendarId, $objectUri, $calendarData, $extraData, $calendarType) {
$query = $this->db->getQueryBuilder();
$query->update('calendarobjects')
->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
->set('lastmodified', $query->createNamedParameter(time()))
->set('etag', $query->createNamedParameter($extraData['etag']))
->set('size', $query->createNamedParameter($extraData['size']))
->set('componenttype', $query->createNamedParameter($extraData['componentType']))
->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
->set('classification', $query->createNamedParameter($extraData['classification']))
->set('uid', $query->createNamedParameter($extraData['uid']))
->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
->set('lastmodified', $query->createNamedParameter(time()))
->set('etag', $query->createNamedParameter($extraData['etag']))
->set('size', $query->createNamedParameter($extraData['size']))
->set('componenttype', $query->createNamedParameter($extraData['componentType']))
->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
->set('classification', $query->createNamedParameter($extraData['classification']))
->set('uid', $query->createNamedParameter($extraData['uid']))
->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)))
@ -1499,13 +1499,13 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
if (!empty($pathInfo['extension'])) {
// Append a suffix to "free" the old URI for recreation
$newUri = sprintf(
"%s-deleted.%s",
'%s-deleted.%s',
$pathInfo['filename'],
$pathInfo['extension']
);
} else {
$newUri = sprintf(
"%s-deleted",
'%s-deleted',
$pathInfo['filename']
);
}
@ -1553,8 +1553,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
public function restoreCalendarObject(array $objectData): void {
$this->cachedObjects = [];
$this->atomic(function () use ($objectData) {
$id = (int) $objectData['id'];
$restoreUri = str_replace("-deleted.ics", ".ics", $objectData['uri']);
$id = (int)$objectData['id'];
$restoreUri = str_replace('-deleted.ics', '.ics', $objectData['uri']);
$targetObject = $this->getCalendarObject(
$objectData['calendarid'],
$restoreUri
@ -1583,17 +1583,17 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
// Welp, this should possibly not have happened, but let's ignore
return;
}
$this->addChanges($row['calendarid'], [$row['uri']], 1, (int) $row['calendartype']);
$this->addChanges($row['calendarid'], [$row['uri']], 1, (int)$row['calendartype']);
$calendarRow = $this->getCalendarById((int) $row['calendarid']);
$calendarRow = $this->getCalendarById((int)$row['calendarid']);
if ($calendarRow === null) {
throw new RuntimeException('Calendar object data that was just written can\'t be read back. Check your database configuration.');
}
$this->dispatcher->dispatchTyped(
new CalendarObjectRestoredEvent(
(int) $objectData['calendarid'],
(int)$objectData['calendarid'],
$calendarRow,
$this->getShares((int) $row['calendarid']),
$this->getShares((int)$row['calendarid']),
$row
)
);
@ -2286,7 +2286,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$result = $calendarObjectIdQuery->executeQuery();
$matches = [];
while (($row = $result->fetch()) !== false) {
$matches[] = (int) $row['objectid'];
$matches[] = (int)$row['objectid'];
}
$result->closeCursor();
@ -2373,7 +2373,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'calendardata' => $this->readBlob($row['calendardata']),
'component' => strtolower($row['componenttype']),
'classification' => (int)$row['classification'],
'deleted_at' => isset($row['deleted_at']) ? ((int) $row['deleted_at']) : null,
'deleted_at' => isset($row['deleted_at']) ? ((int)$row['deleted_at']) : null,
];
}
@ -2765,9 +2765,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
public function getSchedulingObjects($principalUri) {
$query = $this->db->getQueryBuilder();
$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
->from('schedulingobjects')
->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
->executeQuery();
->from('schedulingobjects')
->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
->executeQuery();
$results = [];
while (($row = $stmt->fetch()) !== false) {
@ -2795,9 +2795,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$this->cachedObjects = [];
$query = $this->db->getQueryBuilder();
$query->delete('schedulingobjects')
->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
->executeStatement();
->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
->executeStatement();
}
/**
@ -2940,7 +2940,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
);
$resultDeleted = $qbDeleted->executeQuery();
$deletedUris = array_map(function (string $uri) {
return str_replace("-deleted.ics", ".ics", $uri);
return str_replace('-deleted.ics', '.ics', $uri);
}, $resultDeleted->fetchAll(\PDO::FETCH_COLUMN));
$resultDeleted->closeCursor();
$this->addChanges($calendarId, $deletedUris, 3, $calendarType);
@ -3423,7 +3423,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->from('calendarchanges');
$result = $query->executeQuery();
$maxId = (int) $result->fetchOne();
$maxId = (int)$result->fetchOne();
$result->closeCursor();
if (!$maxId || $maxId < $keep) {
return 0;

View file

@ -376,7 +376,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
* @inheritDoc
*/
public function restore(): void {
$this->caldavBackend->restoreCalendar((int) $this->calendarInfo['id']);
$this->caldavBackend->restoreCalendar((int)$this->calendarInfo['id']);
}
public function disableTrashbin(): void {

View file

@ -43,7 +43,7 @@ class CalendarImpl implements ICreateFromString, IHandleImipMessage {
* @since 13.0.0
*/
public function getKey(): string {
return (string) $this->calendarInfo['id'];
return (string)$this->calendarInfo['id'];
}
/**
@ -96,7 +96,7 @@ class CalendarImpl implements ICreateFromString, IHandleImipMessage {
* @param string $pattern which should match within the $searchProperties
* @param array $searchProperties defines the properties within the query pattern should match
* @param array $options - optional parameters:
* ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
* ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
* @param int|null $limit - limit number of search results
* @param int|null $offset - offset for paging of search results
* @return array an array of events/journals/todos which are arrays of key-value-pairs

View file

@ -62,7 +62,7 @@ class CalendarObject extends \Sabre\CalDAV\CalendarObject {
}
public function getId(): int {
return (int) $this->objectData['id'];
return (int)$this->objectData['id'];
}
protected function isShared() {

View file

@ -66,8 +66,8 @@ class EventReader {
* @since 30.0.0
*
* @param VCalendar|VEvent|Array|String $input
* @param string|null $uid
* @param DateTimeZone|null $timeZone reference timezone for floating dates and times
* @param string|null $uid
* @param DateTimeZone|null $timeZone reference timezone for floating dates and times
*/
public function __construct(VCalendar|VEvent|array|string $input, ?string $uid = null, ?DateTimeZone $timeZone = null) {
@ -295,9 +295,9 @@ class EventReader {
*
* @since 30.0.0
*
* @return string|null R - Relative or A - Absolute
* @return string|null R - Relative or A - Absolute
*/
public function recurringPattern(): string | null {
public function recurringPattern(): string|null {
if ($this->rruleIterator === null && $this->rdateIterator === null) {
return null;
}
@ -312,9 +312,9 @@ class EventReader {
*
* @since 30.0.0
*
* @return string|null daily, weekly, monthly, yearly, fixed
* @return string|null daily, weekly, monthly, yearly, fixed
*/
public function recurringPrecision(): string | null {
public function recurringPrecision(): string|null {
if ($this->rruleIterator !== null) {
return $this->rruleIterator->precision();
}
@ -331,7 +331,7 @@ class EventReader {
*
* @return int|null
*/
public function recurringInterval(): int | null {
public function recurringInterval(): int|null {
return $this->rruleIterator?->interval();
}
@ -374,14 +374,14 @@ class EventReader {
*
* @return int|null
*/
public function recurringConcludesAfter(): int | null {
public function recurringConcludesAfter(): int|null {
// construct count place holder
$count = 0;
// retrieve and add RRULE iterations count
$count += (int) $this->rruleIterator?->concludesAfter();
$count += (int)$this->rruleIterator?->concludesAfter();
// retrieve and add RDATE iterations count
$count += (int) $this->rdateIterator?->concludesAfter();
$count += (int)$this->rdateIterator?->concludesAfter();
// return count
return !empty($count) ? $count : null;
@ -399,7 +399,7 @@ class EventReader {
*
* @return DateTime|null
*/
public function recurringConcludesOn(): DateTime | null {
public function recurringConcludesOn(): DateTime|null {
if ($this->rruleIterator !== null) {
// retrieve rrule conclusion date
@ -626,7 +626,7 @@ class EventReader {
*
* @return DateTime
*/
public function recurrenceDate(): DateTime | null {
public function recurrenceDate(): DateTime|null {
if ($this->recurrenceCurrentDate !== null) {
return DateTime::createFromInterface($this->recurrenceCurrentDate);
} else {
@ -745,7 +745,7 @@ class EventReader {
*
* @since 30.0.0
*
* @param DateTimeInterface $dt date and time to advance
* @param DateTimeInterface $dt date and time to advance
*
* @return void
*/

View file

@ -13,15 +13,15 @@ use DateTime;
class EventReaderRDate extends \Sabre\VObject\Recur\RDateIterator {
public function concludes(): DateTime | null {
public function concludes(): DateTime|null {
return $this->concludesOn();
}
public function concludesAfter(): int | null {
public function concludesAfter(): int|null {
return !empty($this->dates) ? count($this->dates) : null;
}
public function concludesOn(): DateTime | null {
public function concludesOn(): DateTime|null {
if (count($this->dates) > 0) {
return new DateTime(
$this->dates[array_key_last($this->dates)],

View file

@ -22,7 +22,7 @@ class EventReaderRRule extends \Sabre\VObject\Recur\RRuleIterator {
return $this->interval;
}
public function concludes(): DateTime | null {
public function concludes(): DateTime|null {
// evaluate if until value is a date
if ($this->until instanceof DateTimeInterface) {
return DateTime::createFromInterface($this->until);
@ -48,11 +48,11 @@ class EventReaderRRule extends \Sabre\VObject\Recur\RRuleIterator {
return null;
}
public function concludesAfter(): int | null {
public function concludesAfter(): int|null {
return !empty($this->count) ? $this->count : null;
}
public function concludesOn(): DateTime | null {
public function concludesOn(): DateTime|null {
return isset($this->until) ? DateTime::createFromInterface($this->until) : null;
}

View file

@ -133,7 +133,7 @@ class PublishPlugin extends ServerPlugin {
$path = $request->getPath();
// Only handling xml
$contentType = (string) $request->getHeader('Content-Type');
$contentType = (string)$request->getHeader('Content-Type');
if (!str_contains($contentType, 'application/xml') && !str_contains($contentType, 'text/xml')) {
return;
}

View file

@ -188,15 +188,15 @@ class Backend {
* @return array
*/
private function fixRowTyping(array $row): array {
$row['id'] = (int) $row['id'];
$row['calendar_id'] = (int) $row['calendar_id'];
$row['object_id'] = (int) $row['object_id'];
$row['is_recurring'] = (bool) $row['is_recurring'];
$row['recurrence_id'] = (int) $row['recurrence_id'];
$row['is_recurrence_exception'] = (bool) $row['is_recurrence_exception'];
$row['is_relative'] = (bool) $row['is_relative'];
$row['notification_date'] = (int) $row['notification_date'];
$row['is_repeat_based'] = (bool) $row['is_repeat_based'];
$row['id'] = (int)$row['id'];
$row['calendar_id'] = (int)$row['calendar_id'];
$row['object_id'] = (int)$row['object_id'];
$row['is_recurring'] = (bool)$row['is_recurring'];
$row['recurrence_id'] = (int)$row['recurrence_id'];
$row['is_recurrence_exception'] = (bool)$row['is_recurrence_exception'];
$row['is_relative'] = (bool)$row['is_relative'];
$row['notification_date'] = (int)$row['notification_date'];
$row['is_repeat_based'] = (bool)$row['is_repeat_based'];
return $row;
}

View file

@ -113,7 +113,7 @@ abstract class AbstractProvider implements INotificationProvider {
*/
private function getStatusOfEvent(VEvent $vevent):string {
if ($vevent->STATUS) {
return (string) $vevent->STATUS;
return (string)$vevent->STATUS;
}
// Doesn't say so in the standard,

View file

@ -149,11 +149,11 @@ class EmailProvider extends AbstractProvider {
$this->getAbsoluteImagePath('places/calendar.png'));
if (isset($vevent->LOCATION)) {
$template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
$template->addBodyListItem((string)$vevent->LOCATION, $l10n->t('Where:'),
$this->getAbsoluteImagePath('actions/address.png'));
}
if (isset($vevent->DESCRIPTION)) {
$template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
$template->addBodyListItem((string)$vevent->DESCRIPTION, $l10n->t('Description:'),
$this->getAbsoluteImagePath('actions/more.png'));
}
}

View file

@ -65,7 +65,7 @@ class PushProvider extends AbstractProvider {
}
$eventDetails = $this->extractEventDetails($vevent);
$eventUUID = (string) $vevent->UID;
$eventUUID = (string)$vevent->UID;
if (!$eventUUID) {
return;
};
@ -100,13 +100,13 @@ class PushProvider extends AbstractProvider {
return [
'title' => isset($vevent->SUMMARY)
? ((string) $vevent->SUMMARY)
? ((string)$vevent->SUMMARY)
: null,
'description' => isset($vevent->DESCRIPTION)
? ((string) $vevent->DESCRIPTION)
? ((string)$vevent->DESCRIPTION)
: null,
'location' => isset($vevent->LOCATION)
? ((string) $vevent->LOCATION)
? ((string)$vevent->LOCATION)
: null,
'all_day' => $start instanceof Property\ICalendar\Date,
'start_atom' => $start->getDateTime()->format(\DateTimeInterface::ATOM),

View file

@ -206,14 +206,14 @@ class ReminderService {
if (!$vcalendar) {
return;
}
$calendarTimeZone = $this->getCalendarTimeZone((int) $objectData['calendarid']);
$calendarTimeZone = $this->getCalendarTimeZone((int)$objectData['calendarid']);
$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
if (count($vevents) === 0) {
return;
}
$uid = (string) $vevents[0]->UID;
$uid = (string)$vevents[0]->UID;
$recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
$masterItem = $this->getMasterItemFromListOfVEvents($vevents);
$now = $this->timeFactory->getDateTime();
@ -283,7 +283,7 @@ class ReminderService {
continue;
}
if (!\in_array((string) $valarm->ACTION, self::REMINDER_TYPES, true)) {
if (!\in_array((string)$valarm->ACTION, self::REMINDER_TYPES, true)) {
// Action allows x-name, we don't insert reminders
// into the database if they are not standard
$processedAlarms[] = $alarmHash;
@ -353,7 +353,7 @@ class ReminderService {
return;
}
$this->backend->cleanRemindersForEvent((int) $objectData['id']);
$this->backend->cleanRemindersForEvent((int)$objectData['id']);
}
/**
@ -402,19 +402,19 @@ class ReminderService {
$alarms[] = [
'calendar_id' => $objectData['calendarid'],
'object_id' => $objectData['id'],
'uid' => (string) $valarm->parent->UID,
'uid' => (string)$valarm->parent->UID,
'is_recurring' => $isRecurring,
'recurrence_id' => $recurrenceId,
'is_recurrence_exception' => $isRecurrenceException,
'event_hash' => $eventHash,
'alarm_hash' => $alarmHash,
'type' => (string) $valarm->ACTION,
'type' => (string)$valarm->ACTION,
'is_relative' => $isRelative,
'notification_date' => $notificationDate->getTimestamp(),
'is_repeat_based' => false,
];
$repeat = isset($valarm->REPEAT) ? (int) $valarm->REPEAT->getValue() : 0;
$repeat = isset($valarm->REPEAT) ? (int)$valarm->REPEAT->getValue() : 0;
for ($i = 0; $i < $repeat; $i++) {
if ($valarm->DURATION === null) {
continue;
@ -424,13 +424,13 @@ class ReminderService {
$alarms[] = [
'calendar_id' => $objectData['calendarid'],
'object_id' => $objectData['id'],
'uid' => (string) $valarm->parent->UID,
'uid' => (string)$valarm->parent->UID,
'is_recurring' => $isRecurring,
'recurrence_id' => $recurrenceId,
'is_recurrence_exception' => $isRecurrenceException,
'event_hash' => $eventHash,
'alarm_hash' => $alarmHash,
'type' => (string) $valarm->ACTION,
'type' => (string)$valarm->ACTION,
'is_relative' => $isRelative,
'notification_date' => $clonedNotificationDate->getTimestamp(),
'is_repeat_based' => true,
@ -453,17 +453,17 @@ class ReminderService {
}
foreach (array_values($uniqueReminders) as $reminder) {
$this->backend->insertReminder(
(int) $reminder['calendar_id'],
(int) $reminder['object_id'],
(int)$reminder['calendar_id'],
(int)$reminder['object_id'],
$reminder['uid'],
$reminder['is_recurring'],
(int) $reminder['recurrence_id'],
(int)$reminder['recurrence_id'],
$reminder['is_recurrence_exception'],
$reminder['event_hash'],
$reminder['alarm_hash'],
$reminder['type'],
$reminder['is_relative'],
(int) $reminder['notification_date'],
(int)$reminder['notification_date'],
$reminder['is_repeat_based']
);
}
@ -486,7 +486,7 @@ class ReminderService {
$vevents = $this->getAllVEventsFromVCalendar($vevent->parent);
$recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
$now = $this->timeFactory->getDateTime();
$calendarTimeZone = $this->getCalendarTimeZone((int) $reminder['calendar_id']);
$calendarTimeZone = $this->getCalendarTimeZone((int)$reminder['calendar_id']);
try {
$iterator = new EventIterator($vevents, $reminder['uid']);
@ -602,26 +602,26 @@ class ReminderService {
*/
private function getEventHash(VEvent $vevent):string {
$properties = [
(string) $vevent->DTSTART->serialize(),
(string)$vevent->DTSTART->serialize(),
];
if ($vevent->DTEND) {
$properties[] = (string) $vevent->DTEND->serialize();
$properties[] = (string)$vevent->DTEND->serialize();
}
if ($vevent->DURATION) {
$properties[] = (string) $vevent->DURATION->serialize();
$properties[] = (string)$vevent->DURATION->serialize();
}
if ($vevent->{'RECURRENCE-ID'}) {
$properties[] = (string) $vevent->{'RECURRENCE-ID'}->serialize();
$properties[] = (string)$vevent->{'RECURRENCE-ID'}->serialize();
}
if ($vevent->RRULE) {
$properties[] = (string) $vevent->RRULE->serialize();
$properties[] = (string)$vevent->RRULE->serialize();
}
if ($vevent->EXDATE) {
$properties[] = (string) $vevent->EXDATE->serialize();
$properties[] = (string)$vevent->EXDATE->serialize();
}
if ($vevent->RDATE) {
$properties[] = (string) $vevent->RDATE->serialize();
$properties[] = (string)$vevent->RDATE->serialize();
}
return md5(implode('::', $properties));
@ -636,15 +636,15 @@ class ReminderService {
*/
private function getAlarmHash(VAlarm $valarm):string {
$properties = [
(string) $valarm->ACTION->serialize(),
(string) $valarm->TRIGGER->serialize(),
(string)$valarm->ACTION->serialize(),
(string)$valarm->TRIGGER->serialize(),
];
if ($valarm->DURATION) {
$properties[] = (string) $valarm->DURATION->serialize();
$properties[] = (string)$valarm->DURATION->serialize();
}
if ($valarm->REPEAT) {
$properties[] = (string) $valarm->REPEAT->serialize();
$properties[] = (string)$valarm->REPEAT->serialize();
}
return md5(implode('::', $properties));
@ -664,7 +664,7 @@ class ReminderService {
return null;
}
$uid = (string) $vevents[0]->UID;
$uid = (string)$vevents[0]->UID;
$recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
$masterItem = $this->getMasterItemFromListOfVEvents($vevents);
@ -715,7 +715,7 @@ class ReminderService {
*/
private function getStatusOfEvent(VEvent $vevent):string {
if ($vevent->STATUS) {
return (string) $vevent->STATUS;
return (string)$vevent->STATUS;
}
// Doesn't say so in the standard,

View file

@ -386,7 +386,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
try {
$stmt = $query->executeQuery();
} catch (Exception $e) {
$this->logger->error("Could not search resources: " . $e->getMessage(), ['exception' => $e]);
$this->logger->error('Could not search resources: ' . $e->getMessage(), ['exception' => $e]);
}
$rows = [];

View file

@ -36,10 +36,10 @@ class RetentionService {
public function getDuration(): int {
return max(
(int) $this->config->getAppValue(
(int)$this->config->getAppValue(
Application::APP_ID,
self::RETENTION_CONFIG_KEY,
(string) self::DEFAULT_RETENTION_SECONDS
(string)self::DEFAULT_RETENTION_SECONDS
),
0 // Just making sure we don't delete things in the future when a negative number is passed
);

View file

@ -256,7 +256,7 @@ class IMipService {
public function generateWhenStringRecurringDaily(EventReader $er): string {
// initialize
$interval = (int) $er->recurringInterval();
$interval = (int)$er->recurringInterval();
$startTime = '';
$endTime = '';
$conclusion = '';
@ -308,7 +308,7 @@ class IMipService {
public function generateWhenStringRecurringWeekly(EventReader $er): string {
// initialize
$interval = (int) $er->recurringInterval();
$interval = (int)$er->recurringInterval();
$startTime = '';
$endTime = '';
$conclusion = '';
@ -362,7 +362,7 @@ class IMipService {
public function generateWhenStringRecurringMonthly(EventReader $er): string {
// initialize
$interval = (int) $er->recurringInterval();
$interval = (int)$er->recurringInterval();
$startTime = '';
$endTime = '';
$conclusion = '';
@ -428,7 +428,7 @@ class IMipService {
public function generateWhenStringRecurringYearly(EventReader $er): string {
// initialize
$interval = (int) $er->recurringInterval();
$interval = (int)$er->recurringInterval();
$startTime = '';
$endTime = '';
$conclusion = '';

View file

@ -83,7 +83,7 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
}
public function getSize() {
return (int) $this->objectData['size'];
return (int)$this->objectData['size'];
}
public function restore(): void {
@ -91,7 +91,7 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
}
public function getDeletedAt(): ?int {
return $this->objectData['deleted_at'] ? (int) $this->objectData['deleted_at'] : null;
return $this->objectData['deleted_at'] ? (int)$this->objectData['deleted_at'] : null;
}
public function getCalendarUri(): string {

View file

@ -51,7 +51,7 @@ class DeletedCalendarObjectsCollection implements ICalendarObjectContainer, IACL
$data = $this->caldavBackend->getCalendarObjectById(
$this->principalInfo['uri'],
(int) $matches[1],
(int)$matches[1],
);
// If the object hasn't been deleted yet then we don't want to find it here

View file

@ -30,7 +30,7 @@ class CalDavValidatePlugin extends ServerPlugin {
public function beforePut(RequestInterface $request, ResponseInterface $response): bool {
// evaluate if card size exceeds defined limit
$eventSizeLimit = $this->config->getValueInt(Application::APP_ID, 'event_size_limit', 10485760);
if ((int) $request->getRawServerValue('CONTENT_LENGTH') > $eventSizeLimit) {
if ((int)$request->getRawServerValue('CONTENT_LENGTH') > $eventSizeLimit) {
throw new Forbidden("VEvent or VTodo object exceeds $eventSizeLimit bytes");
}
// all tests passed return true

View file

@ -28,9 +28,9 @@ class Plugin extends ServerPlugin {
* @var string[]
*/
public const ENABLE_FOR_CLIENTS = [
"/^MSFT-WIN-3/",
"/Evolution/",
"/KIO/"
'/^MSFT-WIN-3/',
'/Evolution/',
'/KIO/'
];
/**

View file

@ -60,7 +60,7 @@ class RefreshWebcalService {
return;
}
$localData = $this->calDavBackend->getLimitedCalendarObjects((int) $subscription['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
$localData = $this->calDavBackend->getLimitedCalendarObjects((int)$subscription['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
$stripTodos = ($subscription[self::STRIP_TODOS] ?? 1) === 1;
$stripAlarms = ($subscription[self::STRIP_ALARMS] ?? 1) === 1;
@ -124,13 +124,13 @@ class RefreshWebcalService {
try {
$objectUri = $this->getRandomCalendarObjectUri();
$this->calDavBackend->createCalendarObject($subscription['id'], $objectUri, $vObject->serialize(), CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
} catch (NoInstancesException | BadRequest $ex) {
} catch (NoInstancesException|BadRequest $ex) {
$this->logger->error('Unable to create calendar object from subscription {subscriptionId}', ['exception' => $ex, 'subscriptionId' => $subscription['id'], 'source' => $subscription['source']]);
}
}
$ids = array_map(static function ($dataSet): int {
return (int) $dataSet['id'];
return (int)$dataSet['id'];
}, $localData);
$uris = array_map(static function ($dataSet): string {
return $dataSet['uri'];
@ -150,7 +150,7 @@ class RefreshWebcalService {
$this->updateSubscription($subscription, $mutations);
} catch (ParseException $ex) {
$this->logger->error("Subscription {subscriptionId} could not be refreshed due to a parsing error", ['exception' => $ex, 'subscriptionId' => $subscription['id']]);
$this->logger->error('Subscription {subscriptionId} could not be refreshed due to a parsing error', ['exception' => $ex, 'subscriptionId' => $subscription['id']]);
}
}

View file

@ -111,7 +111,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('addressbook', (int) $addressbookData['id'])
->setObject('addressbook', (int)$addressbookData['id'])
->setType('contacts')
->setAuthor($currentUser);
@ -139,7 +139,7 @@ class Backend {
[
'actor' => $currentUser,
'addressbook' => [
'id' => (int) $addressbookData['id'],
'id' => (int)$addressbookData['id'],
'uri' => $addressbookData['uri'],
'name' => $addressbookData['{DAV:}displayname'],
],
@ -170,7 +170,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('addressbook', (int) $addressbookData['id'])
->setObject('addressbook', (int)$addressbookData['id'])
->setType('contacts')
->setAuthor($currentUser);
@ -195,7 +195,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'addressbook' => [
'id' => (int) $addressbookData['id'],
'id' => (int)$addressbookData['id'],
'uri' => $addressbookData['uri'],
'name' => $addressbookData['{DAV:}displayname'],
],
@ -224,7 +224,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'addressbook' => [
'id' => (int) $addressbookData['id'],
'id' => (int)$addressbookData['id'],
'uri' => $addressbookData['uri'],
'name' => $addressbookData['{DAV:}displayname'],
],
@ -266,7 +266,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'addressbook' => [
'id' => (int) $addressbookData['id'],
'id' => (int)$addressbookData['id'],
'uri' => $addressbookData['uri'],
'name' => $addressbookData['{DAV:}displayname'],
],
@ -293,7 +293,7 @@ class Backend {
$parameters = [
'actor' => $event->getAuthor(),
'addressbook' => [
'id' => (int) $addressbookData['id'],
'id' => (int)$addressbookData['id'],
'uri' => $addressbookData['uri'],
'name' => $addressbookData['{DAV:}displayname'],
],
@ -371,7 +371,7 @@ class Backend {
[
'actor' => $event->getAuthor(),
'addressbook' => [
'id' => (int) $properties['id'],
'id' => (int)$properties['id'],
'uri' => $properties['uri'],
'name' => $properties['{DAV:}displayname'],
],
@ -415,7 +415,7 @@ class Backend {
$event = $this->activityManager->generateEvent();
$event->setApp('dav')
->setObject('addressbook', (int) $addressbookData['id'])
->setObject('addressbook', (int)$addressbookData['id'])
->setType('contacts')
->setAuthor($currentUser);
@ -427,7 +427,7 @@ class Backend {
$params = [
'actor' => $event->getAuthor(),
'addressbook' => [
'id' => (int) $addressbookData['id'],
'id' => (int)$addressbookData['id'],
'uri' => $addressbookData['uri'],
'name' => $addressbookData['{DAV:}displayname'],
],
@ -454,7 +454,7 @@ class Backend {
*/
protected function getCardNameAndId(array $cardData): array {
$vObject = Reader::read($cardData['carddata']);
return ['id' => (string) $vObject->UID, 'name' => (string) ($vObject->FN ?? '')];
return ['id' => (string)$vObject->UID, 'name' => (string)($vObject->FN ?? '')];
}
/**

View file

@ -38,8 +38,8 @@ class Filter implements IFilter {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
*/
public function getPriority(): int {
return 40;

View file

@ -21,7 +21,7 @@ abstract class Base implements IProvider {
/** @var IUserManager */
protected $userManager;
/** @var string[] */
/** @var string[] */
protected $userDisplayNames = [];
/** @var IGroupManager */

View file

@ -27,8 +27,8 @@ class Setting extends CalDAVSetting {
/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The filters are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
*/
public function getPriority(): int {
return 50;

View file

@ -78,19 +78,19 @@ class AddressBookImpl implements IAddressBook {
* @param string $pattern which should match within the $searchProperties
* @param array $searchProperties defines the properties within the query pattern should match
* @param array $options Options to define the output format and search behavior
* - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
* example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']]
* - 'escape_like_param' - If set to false wildcards _ and % are not escaped
* - 'limit' - Set a numeric limit for the search results
* - 'offset' - Set the offset for the limited search results
* - 'wildcard' - Whether the search should use wildcards
* - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
* example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']]
* - 'escape_like_param' - If set to false wildcards _ and % are not escaped
* - 'limit' - Set a numeric limit for the search results
* - 'offset' - Set the offset for the limited search results
* - 'wildcard' - Whether the search should use wildcards
* @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
* @return array an array of contacts which are arrays of key-value-pairs
* example result:
* [
* ['id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'],
* ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['d@e.f', 'g@h.i']]
* ]
* example result:
* [
* ['id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'],
* ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['d@e.f', 'g@h.i']]
* ]
* @since 5.0.0
*/
public function search($pattern, $searchProperties, $options) {
@ -131,13 +131,13 @@ class AddressBookImpl implements IAddressBook {
if (is_string($entry)) {
$property = $vCard->createProperty($key, $entry);
} else {
if (($key === "ADR" || $key === "PHOTO") && is_string($entry["value"])) {
$entry["value"] = stripslashes($entry["value"]);
$entry["value"] = explode(';', $entry["value"]);
if (($key === 'ADR' || $key === 'PHOTO') && is_string($entry['value'])) {
$entry['value'] = stripslashes($entry['value']);
$entry['value'] = explode(';', $entry['value']);
}
$property = $vCard->createProperty($key, $entry["value"]);
if (isset($entry["type"])) {
$property->add('TYPE', $entry["type"]);
$property = $vCard->createProperty($key, $entry['value']);
if (isset($entry['type'])) {
$property->add('TYPE', $entry['type']);
}
}
$vCard->add($property);

View file

@ -10,7 +10,7 @@ namespace OCA\DAV\CardDAV;
class Card extends \Sabre\CardDAV\Card {
public function getId(): int {
return (int) $this->cardData['id'];
return (int)$this->cardData['id'];
}
public function getUri(): string {

View file

@ -76,7 +76,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
$result = $query->executeQuery();
$column = (int) $result->fetchOne();
$column = (int)$result->fetchOne();
$result->closeCursor();
return $column;
}
@ -330,7 +330,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
->executeStatement();
$this->addChange($addressBookId, "", 2);
$this->addChange($addressBookId, '', 2);
$addressBookRow = $this->getAddressBookById((int)$addressBookId);
$shares = $this->getShares((int)$addressBookId);
@ -1032,11 +1032,11 @@ class CardDavBackend implements BackendInterface, SyncSupport {
* @param string $pattern which should match within the $searchProperties
* @param array $searchProperties defines the properties within the query pattern should match
* @param array $options = array() to define the search behavior
* - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
* - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
* - 'limit' - Set a numeric limit for the search results
* - 'offset' - Set the offset for the limited search results
* - 'wildcard' - Whether the search should use wildcards
* - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
* - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
* - 'limit' - Set a numeric limit for the search results
* - 'offset' - Set the offset for the limited search results
* - 'wildcard' - Whether the search should use wildcards
* @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
* @return array an array of contacts which are arrays of key-value-pairs
*/
@ -1061,7 +1061,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
array $options = []): array {
return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
$addressBookIds = array_map(static function ($row):int {
return (int) $row['id'];
return (int)$row['id'];
}, $this->getAddressBooksForUser($principalUri));
return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
@ -1186,7 +1186,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
return array_map(function ($array) {
$array['addressbookid'] = (int) $array['addressbookid'];
$array['addressbookid'] = (int)$array['addressbookid'];
$modified = false;
$array['carddata'] = $this->readBlob($array['carddata'], $modified);
if ($modified) {
@ -1398,7 +1398,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
->from('addressbookchanges');
$result = $query->executeQuery();
$maxId = (int) $result->fetchOne();
$maxId = (int)$result->fetchOne();
$result->closeCursor();
if (!$maxId || $maxId < $keep) {
return 0;

View file

@ -12,10 +12,10 @@ use OCP\IL10N;
use OCP\IURLGenerator;
class ContactsManager {
/** @var CardDavBackend */
/** @var CardDavBackend */
private $backend;
/** @var IL10N */
/** @var IL10N */
private $l10n;
/**
@ -45,7 +45,7 @@ class ContactsManager {
* @param IURLGenerator $urlGenerator
*/
public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
$addressBooks = $this->backend->getAddressBooksForUser('principals/system/system');
$this->register($cm, $addressBooks, $urlGenerator);
}

View file

@ -43,7 +43,7 @@ class MultiGetExportPlugin extends DAV\ServerPlugin {
}
// Only handling xml
$contentType = (string) $response->getHeader('Content-Type');
$contentType = (string)$response->getHeader('Content-Type');
if (!str_contains($contentType, 'application/xml') && !str_contains($contentType, 'text/xml')) {
return;
}

View file

@ -19,7 +19,7 @@ use Sabre\VObject\Reader;
class PhotoCache {
/** @var array */
/** @var array */
public const ALLOWED_CONTENT_TYPES = [
'image/png' => 'png',
'image/jpeg' => 'jpg',
@ -119,7 +119,7 @@ class PhotoCache {
$ratio = 1 / $ratio;
}
$size = (int) ($size * $ratio);
$size = (int)($size * $ratio);
if ($size !== -1) {
$photo->resize($size);
}
@ -240,7 +240,7 @@ class PhotoCache {
if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
/** @var Parameter $typeParam */
$typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
$type = (string) $typeParam->getValue();
$type = (string)$typeParam->getValue();
if (str_starts_with($type, 'image/')) {
return $type;

View file

@ -237,7 +237,7 @@ class SyncService {
*/
public function getLocalSystemAddressBook() {
if (is_null($this->localSystemAddressBook)) {
$systemPrincipal = "principals/system/system";
$systemPrincipal = 'principals/system/system';
$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
]);

View file

@ -254,7 +254,7 @@ class SystemAddressbook extends AddressBook {
try {
$this->getChild($uri);
$added[] = $uri;
} catch (NotFound | Forbidden $e) {
} catch (NotFound|Forbidden $e) {
$deleted[] = $uri;
}
}
@ -262,7 +262,7 @@ class SystemAddressbook extends AddressBook {
try {
$this->getChild($uri);
$modified[] = $uri;
} catch (NotFound | Forbidden $e) {
} catch (NotFound|Forbidden $e) {
$deleted[] = $uri;
}
}

View file

@ -89,7 +89,7 @@ class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
try {
$trustedServers = \OC::$server->get(TrustedServers::class);
$request = \OC::$server->get(IRequest::class);
} catch (QueryException | NotFoundExceptionInterface | ContainerExceptionInterface $e) {
} catch (QueryException|NotFoundExceptionInterface|ContainerExceptionInterface $e) {
// nothing to do, the request / trusted servers don't exist
}
if ($addressBook['principaluri'] === 'principals/system/system') {

View file

@ -30,7 +30,7 @@ class CardDavValidatePlugin extends ServerPlugin {
public function beforePut(RequestInterface $request, ResponseInterface $response): bool {
// evaluate if card size exceeds defined limit
$cardSizeLimit = $this->config->getValueInt(Application::APP_ID, 'card_size_limit', 5242880);
if ((int) $request->getRawServerValue('CONTENT_LENGTH') > $cardSizeLimit) {
if ((int)$request->getRawServerValue('CONTENT_LENGTH') > $cardSizeLimit) {
throw new Forbidden("VCard object exceeds $cardSizeLimit bytes");
}
// all tests passed return true

View file

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

View file

@ -56,7 +56,7 @@ class DeleteCalendar extends Command {
InputInterface $input,
OutputInterface $output
): int {
/** @var string $user **/
/** @var string $user */
$user = $input->getArgument('uid');
if (!$this->userManager->userExists($user)) {
throw new \InvalidArgumentException(
@ -67,7 +67,7 @@ class DeleteCalendar extends Command {
if ($birthday !== false) {
$name = BirthdayService::BIRTHDAY_CALENDAR_URI;
} else {
/** @var string $name **/
/** @var string $name */
$name = $input->getArgument('name');
if (!$name) {
throw new \InvalidArgumentException(

View file

@ -56,7 +56,7 @@ class FixCalendarSyncCommand extends Command {
}
private function fixUserCalendars(IUser $user, ?ProgressBar $progress = null): void {
$calendars = $this->calDavBackend->getCalendarsForUser("principals/users/" . $user->getUID());
$calendars = $this->calDavBackend->getCalendarsForUser('principals/users/' . $user->getUID());
foreach ($calendars as $calendar) {
$this->calDavBackend->restoreChanges($calendar['id']);

View file

@ -50,7 +50,7 @@ class MoveCalendar extends Command {
->addArgument('destinationuid',
InputArgument::REQUIRED,
'User who will receive the calendar')
->addOption('force', 'f', InputOption::VALUE_NONE, "Force the migration by removing existing shares and renaming calendars in case of conflicts");
->addOption('force', 'f', InputOption::VALUE_NONE, 'Force the migration by removing existing shares and renaming calendars in case of conflicts');
}
protected function execute(InputInterface $input, OutputInterface $output): int {
@ -97,8 +97,8 @@ class MoveCalendar extends Command {
* Warn that share links have changed if there are shares
*/
$this->io->note([
"Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
"Sharees will need to change \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $newName ?: $calendar['uri'] . "_shared_by_$userDestination\""
'Please note that moving calendar ' . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
'Sharees will need to change "example.com/remote.php/dav/calendars/uid/' . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $newName ?: $calendar['uri'] . "_shared_by_$userDestination\""
]);
}
@ -155,7 +155,7 @@ class MoveCalendar extends Command {
if ($force) {
$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config, $this->logger), [], ['principal:principals/groups/' . $userOrGroup]);
} else {
throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$userOrGroup> with whom the calendar <" . $calendar['uri'] . "> was shared. You may use -f to move the calendar while deleting this share.");
throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$userOrGroup> with whom the calendar <" . $calendar['uri'] . '> was shared. You may use -f to move the calendar while deleting this share.');
}
}
@ -166,7 +166,7 @@ class MoveCalendar extends Command {
if ($force) {
$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config, $this->logger), [], ['principal:principals/users/' . $userOrGroup]);
} else {
throw new \InvalidArgumentException("The calendar <" . $calendar['uri'] . "> is already shared to user <$userDestination>.You may use -f to move the calendar while deleting this share.");
throw new \InvalidArgumentException('The calendar <' . $calendar['uri'] . "> is already shared to user <$userDestination>.You may use -f to move the calendar while deleting this share.");
}
}
}

View file

@ -55,7 +55,7 @@ class SyncBirthdayCalendar extends Command {
$this->birthdayService->syncUser($user);
return self::SUCCESS;
}
$output->writeln("Start birthday calendar sync for all users ...");
$output->writeln('Start birthday calendar sync for all users ...');
$p = new ProgressBar($output);
$p->start();
$this->userManager->callForSeenUsers(function ($user) use ($p) {

View file

@ -30,7 +30,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
public const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
public const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
/** @var IComment */
/** @var IComment */
public $comment;
/** @var ICommentsManager */

View file

@ -34,13 +34,13 @@ class CommentsPlugin extends ServerPlugin {
public const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset';
public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
/** @var ICommentsManager */
/** @var ICommentsManager */
protected $commentsManager;
/** @var \Sabre\DAV\Server $server */
private $server;
/** @var \OCP\IUserSession */
/** @var \OCP\IUserSession */
protected $userSession;
/**

View file

@ -27,7 +27,7 @@ use Sabre\DAV\PropPatch;
class EntityCollection extends RootCollection implements IProperties {
public const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker';
/** @var string */
/** @var string */
protected $id;
protected LoggerInterface $logger;

View file

@ -58,8 +58,8 @@ class AppleQuirksPlugin extends ServerPlugin {
* This method handles HTTP REPORT requests.
*
* @param string $reportName
* @param mixed $report
* @param mixed $path
* @param mixed $report
* @param mixed $path
*
* @return bool
*/

View file

@ -27,7 +27,7 @@ class CachingTree extends Tree {
// flushing the entire cache
$path = trim($path, '/');
foreach ($this->cache as $nodePath => $node) {
$nodePath = (string) $nodePath;
$nodePath = (string)$nodePath;
if ($path === '' || $nodePath == $path || str_starts_with($nodePath, $path . '/')) {
unset($this->cache[$nodePath]);
}

View file

@ -62,7 +62,7 @@ class CommentPropertiesPlugin extends ServerPlugin {
$ids[] = (string)$id;
}
$ids[] = (string) $directory->getId();
$ids[] = (string)$directory->getId();
$unread = $this->commentsManager->getNumberOfUnreadCommentsForObjects('files', $ids, $this->userSession->getUser());
foreach ($unread as $id => $count) {

View file

@ -52,7 +52,7 @@ class DavAclPlugin extends \Sabre\DAVACL\Plugin {
}
if ($this->getCurrentUserPrincipal() === $node->getOwner()) {
throw new Forbidden("Access denied");
throw new Forbidden('Access denied');
} else {
throw new NotFound(
sprintf(

View file

@ -294,7 +294,7 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol
}
$relativePath = $this->fileView->getRelativePath($this->info->getPath());
if ($relativePath === null) {
$this->getLogger()->warning("error while getting quota as the relative path cannot be found");
$this->getLogger()->warning('error while getting quota as the relative path cannot be found');
return [0, 0];
}
@ -311,13 +311,13 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol
];
return $this->quotaInfo;
} catch (\OCP\Files\NotFoundException $e) {
$this->getLogger()->warning("error while getting quota into", ['exception' => $e]);
$this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
return [0, 0];
} catch (\OCP\Files\StorageNotAvailableException $e) {
$this->getLogger()->warning("error while getting quota into", ['exception' => $e]);
$this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
return [0, 0];
} catch (NotPermittedException $e) {
$this->getLogger()->warning("error while getting quota into", ['exception' => $e]);
$this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
return [0, 0];
}
}

View file

@ -14,7 +14,7 @@ class FileLocked extends \Sabre\DAV\Exception {
* @param string $message
* @param int $code
*/
public function __construct($message = "", $code = 0, ?Exception $previous = null) {
public function __construct($message = '', $code = 0, ?Exception $previous = null) {
if ($previous instanceof \OCP\Files\LockNotAcquiredException) {
$message = sprintf('Target file %s is locked by another process.', $previous->path);
}

View file

@ -167,7 +167,7 @@ class FilesPlugin extends ServerPlugin {
}
if (!$sourceNodeFileInfo->isDeletable()) {
throw new Forbidden($source . " cannot be deleted");
throw new Forbidden($source . ' cannot be deleted');
}
}
}
@ -507,7 +507,7 @@ class FilesPlugin extends ServerPlugin {
if (empty($time)) {
return false;
}
$node->setCreationTime((int) $time);
$node->setCreationTime((int)$time);
return true;
});

View file

@ -363,7 +363,7 @@ class FilesReportPlugin extends ServerPlugin {
* Prepare propfind response for the given nodes
*
* @param string $filesUri $filesUri URI leading to root of the files URI,
* with a leading slash but no trailing slash
* with a leading slash but no trailing slash
* @param string[] $requestedProps requested properties
* @param Node[] nodes nodes for which to fetch and prepare responses
* @return Response[]

View file

@ -25,7 +25,7 @@ class ObjectTree extends CachingTree {
protected $fileView;
/**
* @var \OCP\Files\Mount\IMountManager
* @var \OCP\Files\Mount\IMountManager
*/
protected $mountManager;
@ -38,7 +38,7 @@ class ObjectTree extends CachingTree {
/**
* @param \Sabre\DAV\INode $rootNode
* @param \OC\Files\View $view
* @param \OCP\Files\Mount\IMountManager $mountManager
* @param \OCP\Files\Mount\IMountManager $mountManager
*/
public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
$this->rootNode = $rootNode;

View file

@ -180,7 +180,7 @@ class Principal implements BackendInterface {
} elseif ($prefix === 'principals/system') {
return [
'uri' => 'principals/system/' . $name,
'{DAV:}displayname' => $this->languageFactory->get('dav')->t("Accounts"),
'{DAV:}displayname' => $this->languageFactory->get('dav')->t('Accounts'),
];
}
return null;

View file

@ -117,7 +117,7 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin {
*
* @param integer $fileId file id
* @return array list($tags, $favorite) with $tags as tag array
* and $favorite is a boolean whether the file was favorited
* and $favorite is a boolean whether the file was favorited
*/
private function getTagsAndFav($fileId) {
$isFav = false;

View file

@ -156,7 +156,7 @@ class InvitationResponseController extends Controller {
}
$currentTime = $this->timeFactory->getTime();
if (((int) $row['expiration']) < $currentTime) {
if (((int)$row['expiration']) < $currentTime) {
return null;
}

View file

@ -53,9 +53,9 @@ class PublicAuth implements BackendInterface {
*/
public function check(RequestInterface $request, ResponseInterface $response) {
if ($this->isRequestPublic($request)) {
return [true, "principals/system/public"];
return [true, 'principals/system/public'];
}
return [false, "No public access to this resource."];
return [false, 'No public access to this resource.'];
}
/**

View file

@ -136,7 +136,7 @@ abstract class Backend {
'href' => "principal:{$row['principaluri']}",
'commonName' => isset($p['{DAV:}displayname']) ? (string)$p['{DAV:}displayname'] : '',
'status' => 1,
'readOnly' => (int) $row['access'] === Backend::ACCESS_READ,
'readOnly' => (int)$row['access'] === Backend::ACCESS_READ,
'{http://owncloud.org/ns}principal' => (string)$row['principaluri'],
'{http://owncloud.org/ns}group-share' => isset($p['uri']) && str_starts_with($p['uri'], 'principals/groups')
];
@ -162,7 +162,7 @@ abstract class Backend {
'href' => "principal:{$row['principaluri']}",
'commonName' => isset($p['{DAV:}displayname']) ? (string)$p['{DAV:}displayname'] : '',
'status' => 1,
'readOnly' => (int) $row['access'] === self::ACCESS_READ,
'readOnly' => (int)$row['access'] === self::ACCESS_READ,
'{http://owncloud.org/ns}principal' => (string)$row['principaluri'],
'{http://owncloud.org/ns}group-share' => isset($p['uri']) && str_starts_with($p['uri'], 'principals/groups')
];

View file

@ -110,7 +110,7 @@ class Plugin extends ServerPlugin {
$path = $request->getPath();
// Only handling xml
$contentType = (string) $request->getHeader('Content-Type');
$contentType = (string)$request->getHeader('Content-Type');
if (!str_contains($contentType, 'application/xml') && !str_contains($contentType, 'text/xml')) {
return;
}

View file

@ -73,7 +73,7 @@ class ViewOnlyPlugin extends ServerPlugin {
$nodes = $this->userFolder->getById($node->getId());
$node = array_pop($nodes);
if (!$node) {
throw new NotFoundException("Version file not accessible by current user");
throw new NotFoundException('Version file not accessible by current user');
}
}
} else {

View file

@ -63,7 +63,7 @@ class Absence extends Entity implements JsonSerializable {
public function toOutOufOfficeData(IUser $user, string $timezone): IOutOfOfficeData {
if ($user->getUID() !== $this->getUserId()) {
throw new InvalidArgumentException("The user doesn't match the user id of this absence! Expected " . $this->getUserId() . ", got " . $user->getUID());
throw new InvalidArgumentException("The user doesn't match the user id of this absence! Expected " . $this->getUserId() . ', got ' . $user->getUID());
}
if ($this->getId() === null) {
throw new Exception('Creating out-of-office data without ID');

View file

@ -96,7 +96,7 @@ class DirectFile implements IFile {
throw new NotFound();
}
if (!$file instanceof File) {
throw new Forbidden("direct download not allowed on directories");
throw new Forbidden('direct download not allowed on directories');
}
$this->file = $file;

View file

@ -24,7 +24,7 @@ class CalendarDeletedEvent extends Event {
/** @var array */
private $calendarData;
/** @var array */
/** @var array */
private $shares;
/**

View file

@ -21,7 +21,7 @@ class CalendarMovedToTrashEvent extends Event {
/** @var array */
private $calendarData;
/** @var array */
/** @var array */
private $shares;
/**

View file

@ -21,7 +21,7 @@ class CalendarRestoredEvent extends Event {
/** @var array */
private $calendarData;
/** @var array */
/** @var array */
private $shares;
/**

View file

@ -34,7 +34,7 @@ class CalendarShareUpdateListener implements IEventListener {
return;
}
$this->logger->debug("Creating activity for Calendar having its shares updated");
$this->logger->debug('Creating activity for Calendar having its shares updated');
$this->activityBackend->onCalendarUpdateShares(
$event->getCalendarData(),

View file

@ -56,7 +56,7 @@ class BuildCalendarSearchIndex implements IRepairStep {
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
->from('calendarobjects');
$result = $query->execute();
$maxId = (int) $result->fetchOne();
$maxId = (int)$result->fetchOne();
$result->closeCursor();
$output->info('Add background job');

View file

@ -27,8 +27,8 @@ class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
}
public function run($arguments) {
$offset = (int) $arguments['offset'];
$stopAt = (int) $arguments['stopAt'];
$offset = (int)$arguments['offset'];
$stopAt = (int)$arguments['stopAt'];
$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');

View file

@ -68,7 +68,7 @@ class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
->from('calendarobjects');
$result = $query->execute();
$maxId = (int) $result->fetchOne();
$maxId = (int)$result->fetchOne();
$result->closeCursor();
$output->info('Add background job');

View file

@ -96,7 +96,7 @@ class RemoveDeletedUsersCalendarSubscriptions implements IRepairStep {
while ($row = $result->fetch()) {
$username = $this->getPrincipal($row['principaluri']);
if (!$this->userManager->userExists($username)) {
$this->orphanSubscriptionIds[] = (int) $row['id'];
$this->orphanSubscriptionIds[] = (int)$row['id'];
}
}
$result->closeCursor();

View file

@ -71,7 +71,7 @@ class RemoveOrphanEventsAndContacts implements IRepairStep {
$orphanItems = [];
while ($row = $result->fetch()) {
$orphanItems[] = (int) $row['id'];
$orphanItems[] = (int)$row['id'];
}
$result->closeCursor();

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